From a0a163586cf4b124002ce1cc764f0dd677887d09 Mon Sep 17 00:00:00 2001 From: lambdadroid Date: Tue, 9 Oct 2018 20:42:22 +0200 Subject: dosfstools: Fix compile error in Pie tree on 32 bit systems Fixes the following compile error: bootable/recovery/dosfstools/src/check.c:591:4: error: format specifies type 'unsigned long' but the argument has type 'unsigned long long' [-Werror,-Wformat] (uint64_t)clusters * fs->cluster_size, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This was fixed upstream in "Fix format string in check_file() (%lu -> %llu)" (dosfstools/dosfstools@d7665f2) This commit applies the change on top of TWRP's dosfstools copy. Change-Id: I23374594662fd95e795f793112e78c54d8d50b30 --- dosfstools/src/check.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dosfstools/src/check.c b/dosfstools/src/check.c index bbb97e4f3..add822293 100644 --- a/dosfstools/src/check.c +++ b/dosfstools/src/check.c @@ -585,10 +585,10 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) if (!(file->dir_ent.attr & ATTR_DIR) && le32toh(file->dir_ent.size) <= (uint64_t)clusters * fs->cluster_size) { printf - ("%s\n File size is %u bytes, cluster chain length is > %lu " + ("%s\n File size is %u bytes, cluster chain length is > %llu " "bytes.\n Truncating file to %u bytes.\n", path_name(file), le32toh(file->dir_ent.size), - (uint64_t)clusters * fs->cluster_size, + (unsigned long long)clusters * fs->cluster_size, le32toh(file->dir_ent.size)); truncate_file(fs, file, clusters); break; -- cgit v1.2.3